From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 May 2011 05:35:30 +0000 (-0700)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3780^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=823d4a82e48aecb59bbf87500af3d1f6044b4b69;p=emacs.git

Merge from mainline.
---

823d4a82e48aecb59bbf87500af3d1f6044b4b69